Skip to content

fix(vendor): bootstrap.* assets should NOT be devextreme-dist content, partial revert (#33987)#34158

Merged
mpreyskurantov merged 3 commits into
DevExpress:26_1from
mpreyskurantov:26_1-patch-33987-vendor-files-bs-dist
Jun 29, 2026
Merged

fix(vendor): bootstrap.* assets should NOT be devextreme-dist content, partial revert (#33987)#34158
mpreyskurantov merged 3 commits into
DevExpress:26_1from
mpreyskurantov:26_1-patch-33987-vendor-files-bs-dist

Conversation

@mpreyskurantov

@mpreyskurantov mpreyskurantov commented Jun 28, 2026

Copy link
Copy Markdown
Contributor

This (partially) reverts:

The bootstrap.* assets should not be the devextreme-dist content

…ackages/devextreme/, arrange vendor files (with bootstrap) (DevExpress#33987)"

This reverts commit 7cec4ef.

# Conflicts:
#	packages/devextreme/package.json
#	pnpm-lock.yaml
@mpreyskurantov mpreyskurantov self-assigned this Jun 28, 2026
Copilot AI review requested due to automatic review settings June 28, 2026 19:23
@mpreyskurantov mpreyskurantov requested a review from alexslavr June 28, 2026 19:24

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Reverts the prior change that bundled bootstrap.* assets as part of devextreme-dist by removing bootstrap from the packages/devextreme vendor-copy pipeline, while adding bootstrap copying into the root build artifacts flow.

Changes:

  • Removed bootstrap JS/CSS from packages/devextreme copy:vendor:* targets so it’s no longer produced as devextreme package artifacts (and thus shouldn’t be included in devextreme-dist content).
  • Updated the all:build script (tools/scripts/build-all.ts) to copy bootstrap assets into the root artifacts/js and artifacts/css directories.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

File Description
tools/scripts/build-all.ts Adds bootstrap asset copying into the root artifacts as part of all:build.
packages/devextreme/project.json Removes bootstrap from the devextreme package vendor-copy inputs/outputs so it won’t be treated as devextreme-dist content.

Comment thread tools/scripts/build-all.ts Outdated
Copilot AI review requested due to automatic review settings June 29, 2026 08:46

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated no new comments.

@mpreyskurantov mpreyskurantov changed the title fix(vendor): bootstrap.* assets should NOT be devextreme-dist content, revert (#33987) fix(vendor): bootstrap.* assets should NOT be devextreme-dist content, partial revert (#33987) Jun 29, 2026
@mpreyskurantov mpreyskurantov added this pull request to the merge queue Jun 29, 2026
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Jun 29, 2026
@mpreyskurantov mpreyskurantov added this pull request to the merge queue Jun 29, 2026
Merged via the queue into DevExpress:26_1 with commit a16c185 Jun 29, 2026
188 of 197 checks passed
@mpreyskurantov mpreyskurantov deleted the 26_1-patch-33987-vendor-files-bs-dist branch June 29, 2026 12:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants